Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Mon, 31 Jan 2011 23:57:36 +0000 (18:57 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 31 Jan 2011 23:57:36 +0000 (18:57 -0500)
commite04032d8c9052871bcebacb8f18036795dbcc6f2
treed790188620ee9eff9b971c4746eb2c69fd7625c2
parent448e06da9fcc39215a2d4e50bef1e4680ce6345f
parent90c5f2b56a9eb0dc36f60aa6779c67a84585c242
Merge changes from emacs-23 branch